From: Camm Maguire Date: Sun, 22 Feb 2026 16:56:52 +0000 (+0000) Subject: [PATCH] X-Git-Tag: archive/raspbian/2.7.1-12+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1bccf894cecb3394df08f0017ef5f1d4205b9cac;p=gcl27.git [PATCH] TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. Gbp-Pq: Name Version_2_7_2pre10 --- diff --git a/Makefile.am b/Makefile.am index 181c6c2..99dc166 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,7 +110,7 @@ endif EXTRA_DIST=$(D_SRC) $(INCL_C) $(INIT_L) $(INCL_TEXI)\ lsp cmpnew mod pcl clcs ansi-tests elisp xbin bench \ - majvers minvers git.tag release + majvers minvers git.tag release bin/c23.awk # end of primaries @@ -123,7 +123,7 @@ INCL_TEXI=$(addprefix info/,$(addsuffix .texi,\ INCL_C=o/sgbc.c o/gmp_big.c o/gmp.c o/gmp_num_log.c o/cmac.c o/regexp.c o/unexelf.c o/unexmacosx.c o/unexnt.c \ o/save.c o/xdrfuns.c o/fasdump.c o/usig2_aux.c o/sfaslelf.c o/sfaslmacho.c o/sfaslcoff.c gcl-tk/comm.c \ - o/sfasli.c o/firstfile.c o/lastfile.c + o/sfasli.c o/firstfile.c o/lastfile.c o/pre_qfv.c INIT_L=unixport/sys_init.c unixport/sys.c o/boot.c unixport/cinit.lisp BASE_H= h/compbas2.h h/compbas.h h/compprotos.h h/cstack.h h/enum.h h/error.h h/eval.h h/fixnum.h h/frame.h \ h/funlink.h h/globals.h h/gmp_wrappers.h h/immnum.h h/include.h h/lex.h h/linux.h h/lu.h h/make-init.h \ @@ -459,8 +459,8 @@ h/cmpincludea.h: $(filter-out gclincl.h,$(CMPINCLUDE_FILES)) | h/gclincl.h # FIX $(AWK) '/^# |^$$|^#pragma/ {next}{print}' > $@ o/qfv.c: o/pre_qfv.c h/new_decl.h bin/c23.awk - chmod +x bin/c23.awk - $(CPP) $(AM_CPPFLAGS) -P $(CPPFLAGS) $< | bin/c23.awk >$@ + chmod +x $(word 3,$^) + $(CPP) $(AM_CPPFLAGS) -P $(CPPFLAGS) $< | $(word 3,$^) >$@ h/cmpinclude.h: h/mcompdefs.h h/cmpincludea.h h/cmponly_last.h @cat $^ >new_$(@F) diff --git a/Makefile.in b/Makefile.in index 2af9e35..53614b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1017,7 +1017,7 @@ dist_noinst_DATA = $(am__append_5) $(am__append_8) EXTRA_DIST = $(D_SRC) $(INCL_C) $(INIT_L) $(INCL_TEXI)\ lsp cmpnew mod pcl clcs ansi-tests elisp xbin bench \ - majvers minvers git.tag release + majvers minvers git.tag release bin/c23.awk # end of primaries @@ -1030,7 +1030,7 @@ INCL_TEXI = $(addprefix info/,$(addsuffix .texi,\ INCL_C = o/sgbc.c o/gmp_big.c o/gmp.c o/gmp_num_log.c o/cmac.c o/regexp.c o/unexelf.c o/unexmacosx.c o/unexnt.c \ o/save.c o/xdrfuns.c o/fasdump.c o/usig2_aux.c o/sfaslelf.c o/sfaslmacho.c o/sfaslcoff.c gcl-tk/comm.c \ - o/sfasli.c o/firstfile.c o/lastfile.c + o/sfasli.c o/firstfile.c o/lastfile.c o/pre_qfv.c INIT_L = unixport/sys_init.c unixport/sys.c o/boot.c unixport/cinit.lisp BASE_H = h/compbas2.h h/compbas.h h/compprotos.h h/cstack.h h/enum.h h/error.h h/eval.h h/fixnum.h h/frame.h \ @@ -4907,8 +4907,8 @@ h/cmpincludea.h: $(filter-out gclincl.h,$(CMPINCLUDE_FILES)) | h/gclincl.h # FIX $(AWK) '/^# |^$$|^#pragma/ {next}{print}' > $@ o/qfv.c: o/pre_qfv.c h/new_decl.h bin/c23.awk - chmod +x bin/c23.awk - $(CPP) $(AM_CPPFLAGS) -P $(CPPFLAGS) $< | bin/c23.awk >$@ + chmod +x $(word 3,$^) + $(CPP) $(AM_CPPFLAGS) -P $(CPPFLAGS) $< | $(word 3,$^) >$@ h/cmpinclude.h: h/mcompdefs.h h/cmpincludea.h h/cmponly_last.h @cat $^ >new_$(@F) diff --git a/cmpnew/gcl_cmpcall.lsp b/cmpnew/gcl_cmpcall.lsp index 7ccd2d0..9368c35 100644 --- a/cmpnew/gcl_cmpcall.lsp +++ b/cmpnew/gcl_cmpcall.lsp @@ -301,8 +301,11 @@ (unless (= nreq nsup) (list "_n==" (- (1+ nreq)) (unless st "&&"))) (unless st "_l==Cnil") ")")) -(defun mod-argstr (n call st nsup) - (let* ((x (commasep (append (nobs nsup "#") (nobs (- n nsup)) (when st (list "_l"))))) +(defun nobs-wrap (nobs sig &aux (at (car sig))) + (mapcar (lambda (x y) (ms (cdr (assoc y +to-c-var-alist+)) "(" x ")")) nobs at)) + +(defun mod-argstr (n call st nsup sig) + (let* ((x (commasep (append (nobs nsup "#") (nobs-wrap (nobs (- n nsup)) sig) (when st (list "_l"))))) (s (or (position #\# call) (length call)))) (ms (subseq call 0 s) x))) @@ -349,7 +352,7 @@ (let ((nl (list (string #\Newline) " "))) (ms (list "@" (nords (1+ nsup)) ";") "({" (bind-str nreq nsup nl) nl (cond-str nreq nsup st) " ? " nl - (nvfun-wrap cname (mod-argstr nreq argstr st nsup) sig clp ap) " : " nl + (nvfun-wrap cname (mod-argstr nreq argstr st nsup sig) sig clp ap) " : " nl (insufficient-arg-str fnstr nreq nsup sig st) ";})"))))) @@ -490,14 +493,16 @@ (defun stub (num name args type clp - &aux (va (eq '* (car (last args)))) (n (if va 1 0))(i (max n (- (length args) n)));FIXME + &aux (va (eq '* (car (last args)))) (n (if va 1 0)) + (i (max n (- (length args) n)));FIXME + (si (write-to-string i)) (d (declaration-type (rep-type (if (link-arg-p type) type t))))) (concatenate 'string (stub-decl (concatenate 'string "LnkT" num) args d t) "{ - int nargs=" (if va "fcall.argd<0 ? -fcall.argd : fcall.argd" (write-to-string i)) "; - object *FOO=alloca(nargs*sizeof(*FOO)); + int nargs=" (if va "fcall.argd<0 ? -fcall.argd : fcall.argd" si) "; + object *FOO=alloca((nargs>" si "? nargs : " si ")*sizeof(*FOO)); " (let ((j 0)) @@ -512,9 +517,9 @@ " { va_list ap; - va_start(ap,x" (write-to-string i) "); + va_start(ap,x" si "); int i; - for (i=" (write-to-string i) ";i